Google Git
Sign in
chromium / external / gitster / git-htmldocs / 657fd8a8dd93c9d5c7534016aa6601c564fe2601 / . / git-cherry-pick.html
blob: 06d28320c48b007a58409327b37d08abd47458d9 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
307<title>git-cherry-pick(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-cherry-pick(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-cherry-pick -
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]317 Apply the changes introduced by some existing commits
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]323<div class="para"><p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]324</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]325<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]326<div class="sectionbody">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]327<div class="para"><p>Given one or more existing commits, apply the change each one
328introduces, recording a new commit for each. This requires your
329working tree to be clean (no modifications from the HEAD commit).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]330</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]331<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]332<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]333<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]334<dt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]335&lt;commit&gt;&#8230;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]336</dt>
337<dd>
338<p>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]339 Commits to cherry-pick.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]340 For a more complete list of ways to spell commits, see
341 <a href="gitrevisions.html">gitrevisions(1)</a>.
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]342 Sets of commits can be passed but no traversal is done by
343 default, as if the <em>--no-walk</em> option was specified, see
344 <a href="git-rev-list.html">git-rev-list(1)</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]345</p>
346</dd>
347<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]348-e
349</dt>
350<dt>
351--edit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]352</dt>
353<dd>
354<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]355 With this option, <em>git cherry-pick</em> will let you edit the commit
Junio C Hamano0e661132008-01-21 02:37:44[diff] [blame]356 message prior to committing.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]357</p>
358</dd>
359<dt>
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]360-x
361</dt>
362<dd>
363<p>
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]364 When recording the commit, append to the original commit
365 message a note that indicates which commit this change
366 was cherry-picked from. Append the note only for cherry
367 picks without conflicts. Do not use this option if
368 you are cherry-picking from your private branch because
369 the information is useless to the recipient. If on the
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]370 other hand you are cherry-picking between two publicly
371 visible branches (e.g. backporting a fix to a
372 maintenance branch for an older release from a
373 development branch), adding this information can be
374 useful.
375</p>
376</dd>
377<dt>
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]378-r
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]379</dt>
380<dd>
381<p>
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]382 It used to be that the command defaulted to do <tt>-x</tt>
383 described above, and <tt>-r</tt> was to disable it. Now the
384 default is not to do <tt>-x</tt> so this option is a no-op.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]385</p>
386</dd>
387<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]388-m parent-number
389</dt>
390<dt>
391--mainline parent-number
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]392</dt>
393<dd>
394<p>
Junio C Hamano69a98582008-03-01 18:42:18[diff] [blame]395 Usually you cannot cherry-pick a merge because you do not know which
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]396 side of the merge should be considered the mainline. This
397 option specifies the parent number (starting from 1) of
398 the mainline and allows cherry-pick to replay the change
399 relative to the specified parent.
400</p>
401</dd>
402<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]403-n
404</dt>
405<dt>
406--no-commit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]407</dt>
408<dd>
409<p>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]410 Usually the command automatically creates a sequence of commits.
411 This flag applies the changes necessary to cherry-pick
412 each named commit to your working tree and the index,
413 without making any commit. In addition, when this
Junio C Hamano8dae8cd2008-11-24 05:38:55[diff] [blame]414 option is used, your index does not have to match the
415 HEAD commit. The cherry-pick is done against the
Junio C Hamanof69a0a02008-07-17 08:08:47[diff] [blame]416 beginning state of your index.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]417</p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]418<div class="para"><p>This is useful when cherry-picking more than one commits'
Junio C Hamanof69a0a02008-07-17 08:08:47[diff] [blame]419effect to your index in a row.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]420</dd>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]421<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]422-s
423</dt>
424<dt>
425--signoff
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]426</dt>
427<dd>
428<p>
429 Add Signed-off-by line at the end of the commit message.
430</p>
431</dd>
Junio C Hamano961e0522010-03-29 07:49:20[diff] [blame]432<dt>
433--ff
434</dt>
435<dd>
436<p>
437 If the current HEAD is the same as the parent of the
438 cherry-pick'ed commit, then a fast forward to this commit will
439 be performed.
440</p>
441</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]442</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]443</div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]444<h2 id="_examples">EXAMPLES</h2>
445<div class="sectionbody">
446<div class="vlist"><dl>
447<dt>
448git cherry-pick master
449</dt>
450<dd>
451<p>
452 Apply the change introduced by the commit at the tip of the
453 master branch and create a new commit with this change.
454</p>
455</dd>
456<dt>
457git cherry-pick ..master
458</dt>
459<dt>
460git cherry-pick ^HEAD master
461</dt>
462<dd>
463<p>
464 Apply the changes introduced by all commits that are ancestors
465 of master but not of HEAD to produce new commits.
466</p>
467</dd>
468<dt>
469git cherry-pick master\<sub>4 master</sub>2
470</dt>
471<dd>
472<p>
473 Apply the changes introduced by the fifth and third last
474 commits pointed to by master and create 2 new commits with
475 these changes.
476</p>
477</dd>
478<dt>
479git cherry-pick -n master~1 next
480</dt>
481<dd>
482<p>
483 Apply to the working tree and the index the changes introduced
484 by the second last commit pointed to by master and by the last
485 commit pointed to by next, but do not create any commit with
486 these changes.
487</p>
488</dd>
489<dt>
490git cherry-pick --ff ..next
491</dt>
492<dd>
493<p>
494 If history is linear and HEAD is an ancestor of next, update
495 the working tree and advance the HEAD pointer to match next.
496 Otherwise, apply the changes introduced by those commits that
497 are in next but not HEAD to the current branch, creating a new
498 commit for each new change.
499</p>
500</dd>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]501<dt>
502git rev-list --reverse master -- README | git cherry-pick -n --stdin
503</dt>
504<dd>
505<p>
506 Apply the changes introduced by all commits on the master
507 branch that touched README to the working tree and index,
508 so the result can be inspected and made into a single new
509 commit if suitable.
510</p>
511</dd>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]512</dl></div>
513</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]514<h2 id="_author">Author</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]515<div class="sectionbody">
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]516<div class="para"><p>Written by Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]517</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]518<h2 id="_documentation">Documentation</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]519<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]520<div class="para"><p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]521</div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]522<h2 id="_see_also">SEE ALSO</h2>
523<div class="sectionbody">
524<div class="para"><p><a href="git-revert.html">git-revert(1)</a></p></div>
525</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]526<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]527<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]528<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]529</div>
530<div id="footer">
531<div id="footer-text">
Junio C Hamanoac752fa2010-09-19 00:01:00[diff] [blame]532Last updated 2010-09-18 23:56:36 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]533</div>
534</div>
535</body>
536</html>